From b3175d1982deeac1c32afd008fc619b487dc9acb Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 1 Nov 2005 09:26:59 +0000 Subject: [PATCH] Don't look for X_PACKAGES unless building for x11. (#313986, John 2005-11-01 Tor Lillqvist * configure.in: Don't look for X_PACKAGES unless building for x11. (#313986, John Ehresman) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ configure.in | 7 +++++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6c2f5f125..f0a80f2dd8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-11-01 Tor Lillqvist + + * configure.in: Don't look for X_PACKAGES unless building for + x11. (#313986, John Ehresman) + 2005-10-28 Erdal Ronahi * configure.in: Added ku (Kurdish) to ALL_LINGUAS diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c6c2f5f125..f0a80f2dd8 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-11-01 Tor Lillqvist + + * configure.in: Don't look for X_PACKAGES unless building for + x11. (#313986, John Ehresman) + 2005-10-28 Erdal Ronahi * configure.in: Added ku (Kurdish) to ALL_LINGUAS diff --git a/configure.in b/configure.in index dc2f5636c3..193879a1cd 100644 --- a/configure.in +++ b/configure.in @@ -1388,9 +1388,12 @@ fi CFLAGS="$saved_cflags" LDFLAGS="$saved_ldflags" -GDK_PACKAGES="$PANGO_PACKAGES $X_PACKAGES" +GDK_PACKAGES="$PANGO_PACKAGES" +if test "x$gdktarget" = "xx11"; then + GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES" +fi GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" -GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $X_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS" +GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS" # # If we aren't writing explicit dependencies, then don't put the extra libraries we need -- 2.30.2